From: Linus Torvalds Date: Mon, 21 Jul 2008 04:17:20 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~27948 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=d1671a9c15f55a1475d41269494518e348880c33;p=linux-4.9.git Merge git://git./linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: pkt_sched: Fix build with NET_SCHED disabled. --- d1671a9c15f55a1475d41269494518e348880c33